coaster 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeeb91379c4231e8622891bfbfee5c93c202e96706bfa7d569b4bcea3e19d696
-  data.tar.gz: 124f01130e4fadf67e9e28c134e409986f8d1186e324f1b93e35fdf040a09652
+  metadata.gz: ca831c98247a51e387740d4a2b15d9d7c31a37a4a119e69bf9081cc6ef08a438
+  data.tar.gz: dedfc0e5be84563640b98ac5808dda34c735ac2ca40edac5c76d906d69c9b63d
 SHA512:
-  metadata.gz: fe9c0490709aa11a3c96816294702dbebd982b7304af0633f319612035f4be627f030a928749506d454fd2806c485b6e440c37c0895dae8ec2633a780a66f4dd
-  data.tar.gz: 5a7de756347f74c4ece3dad9b36a987d44715b29cca55ded06d2a1bdfb0b38f4e16c654a4d9c2db3284c4cf76ab629afcbfa3bc33f373eeb21fc52db8008d6e0
+  metadata.gz: 4d8591789c4e587d37b88033881c6031d7ce231915058b2eac1b041c5e2d8933a03808a157a6f8cf17b3b5541c0ee25b1fd3b24992956467bfda165369c22968
+  data.tar.gz: f778ee607e1f0a249518df4292427e4fd812ebbca8868b40908e593dce6670d4a818b166a58aa24cb5f195f9159119983684ff1fee0cf6c2273bf02d54a949a6

data/lib/coaster/core_ext/standard_error.rb

@@ -53,6 +53,7 @@ class StandardError
       msg = message
       set_backtrace(message.backtrace)
     when Hash then
+      @coaster = true # coaster 확장을 사용한 에러임을 확인할 수 있음.
       hash = message.with_indifferent_access rescue message
       msg = hash.delete(:m)
       msg = hash.delete(:msg) || msg
@@ -63,6 +64,12 @@ class StandardError
       @level = hash.delete(:level) || hash.delete(:severity) || @level
       @tkey = hash.delete(:tkey)
       @attributes.merge!(hash)
+      if @attributes[:description] == :translate
+        @attributes.delete(:description)
+        @attributes[:description] = _translate
+      end
+      msg = "#{_translate} (#{msg || self.class.name})"
+      msg = "#{msg} {#{cause.message}}" if cause
     when String then
       msg = message
     when FalseClass, NilClass then
@@ -73,7 +80,7 @@ class StandardError
 
     @fingerprint = [] unless @fingerprint.is_a?(Array)
     @tags = {} unless @tags.is_a?(Hash)
-    msg = cause.message if msg.blank? && cause
+    msg = "{#{cause.message}}" if msg.blank? && cause
     super(msg)
   end
 
@@ -115,9 +122,7 @@ class StandardError
 
   # description is user friendly message as a attribute, do not use error's message
   # error message is not user friendly in many cases.
-  def description
-    attributes[:description] || attributes[:desc]
-  end
+  def description; attributes[:description] || attributes[:desc] end
   alias_method :desc, :description
 
   def _translate(*args)
@@ -131,8 +136,9 @@ class StandardError
 
   # user friendly message, for overid
   def user_message
-    return description if description.present?
-    _translate
+    return _translate if description.present? || tkey.present?
+    return "#{_translate} (#{message})" unless defined?(@coaster)
+    message
   end
 
   # another user friendly messages
@@ -142,15 +148,6 @@ class StandardError
     attributes[:descriptions]
   end
 
-  # https://github.com/getsentry/sentry-ruby/blob/fbbc7a51ed10684d0e8b7bd9d2a1b65a7351c9ef/lib/raven/event.rb#L162
-  # sentry message use `to_s` method
-  # https://ruby-doc.org/core-2.5.1/Exception.html#method-i-to_s
-  alias to_origin_s to_s
-
-  def to_s
-    "#{_translate}\n#{to_origin_s}"
-  end
-
   def to_hash
     hash = attributes.merge(
       type: self.class.name, status: status,
@@ -174,7 +171,7 @@ class StandardError
     lg = "[#{self.class.name}] status:#{status}"
     lg += "\n\tMESSAGE: #{safe_message.gsub(/\n/, "\n\t\t")}"
     instance_variables.each do |var|
-      if var.to_s.start_with?('@_')
+      if var.to_s.start_with?('@_') || var.to_s == '@coaster'
         next
       elsif var.to_s == '@spell_checker'
         next

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.3.0'
+  VERSION = '1.3.5'
 end

data/test/test_standard_error.rb

@@ -22,16 +22,16 @@ module Coaster
 
     def test_standard_messages
       e = StandardError.new('developer message')
-      assert_equal "standard error translation\ndeveloper message", e.to_s
-      assert_equal "standard error translation\ndeveloper message", e.message
+      assert_equal "developer message", e.to_s
+      assert_equal "developer message", e.message
       assert_nil e.description
       assert_nil e.desc
       assert_equal 'standard error translation', e._translate
-      assert_equal 'standard error translation', e.user_message
+      assert_equal 'standard error translation (developer message)', e.user_message
       assert_equal 'standard error title', e.title
       e = StandardError.new(m: 'developer message', desc: 'user message')
-      assert_equal "user message\ndeveloper message", e.to_s
-      assert_equal "user message\ndeveloper message", e.message
+      assert_equal "user message (developer message)", e.to_s
+      assert_equal "user message (developer message)", e.message
       assert_equal 'user message', e.description
       assert_equal 'user message', e.desc
       assert_equal 'user message', e._translate
@@ -41,59 +41,83 @@ module Coaster
 
     def test_no_translation_class
       e = UntitledError.new('developer message')
-      assert_equal "standard error translation\ndeveloper message", e.to_s
-      assert_equal "standard error translation\ndeveloper message", e.message
+      assert_equal "developer message", e.to_s
+      assert_equal "developer message", e.message
       assert_nil e.description
       assert_nil e.desc
       assert_equal 'standard error translation', e._translate
-      assert_equal 'standard error translation', e.user_message
+      assert_equal 'standard error translation (developer message)', e.user_message
       assert_equal 'standard error title', e.title
       e = UntitledError.new(m: 'developer message', desc: 'user message')
-      assert_equal "user message\ndeveloper message", e.to_s
-      assert_equal "user message\ndeveloper message", e.message
+      assert_equal "user message (developer message)", e.to_s
+      assert_equal "user message (developer message)", e.message
       assert_equal 'user message', e.description
       assert_equal 'user message', e.desc
       assert_equal 'user message', e._translate
       assert_equal 'user message', e.user_message
       assert_equal 'standard error title', e.title
+      e = UntitledError.new(tkey: 'no.translation')
+      assert_equal "translation missing: en.no.translation (Coaster::TestStandardError::UntitledError)", e.to_s
+      assert_equal "translation missing: en.no.translation (Coaster::TestStandardError::UntitledError)", e.message
+      assert_nil e.description
+      assert_nil e.desc
+      assert_equal 'translation missing: en.no.translation', e._translate
+      assert_equal "translation missing: en.no.translation", e.user_message
+      assert_equal 'standard error title', e.title
     end
 
     def test_with_translation_class
       e = SampleError.new
-      assert_equal "Test sample error\nCoaster::TestStandardError::SampleError", e.to_s
-      assert_equal "Test sample error\nCoaster::TestStandardError::SampleError", e.message
+      assert_equal "Coaster::TestStandardError::SampleError", e.to_s
+      assert_equal "Coaster::TestStandardError::SampleError", e.message
       assert_nil e.description
       assert_nil e.desc
       assert_equal 'Test sample error', e._translate
-      assert_equal 'Test sample error', e.user_message
+      assert_equal 'Test sample error (Coaster::TestStandardError::SampleError)', e.user_message
       assert_equal 'Test this title',  e.title
       e = SampleError.new(beet: 'apple')
-      assert_equal "Test sample error\nCoaster::TestStandardError::SampleError", e.to_s
-      assert_equal "Test sample error\nCoaster::TestStandardError::SampleError", e.message
+      assert_equal "Test sample error (Coaster::TestStandardError::SampleError)", e.to_s
+      assert_equal "Test sample error (Coaster::TestStandardError::SampleError)", e.message
       assert_nil e.description
       assert_nil e.desc
       assert_equal 'Test sample error', e._translate
-      assert_equal 'Test sample error', 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 "Test sample error\ndeveloper message", e.to_s
-      assert_equal "Test sample error\ndeveloper message", e.message
+      assert_equal "developer message", e.to_s
+      assert_equal "developer message", e.message
       assert_nil e.description
       assert_nil e.desc
       assert_equal 'Test sample error', e._translate
+      assert_equal 'Test sample error (developer message)', e.user_message
+      assert_equal 'Test this title', e.title
+      e = SampleError.new(desc: 'user message')
+      assert_equal "user message (Coaster::TestStandardError::SampleError)", e.to_s
+      assert_equal "user message (Coaster::TestStandardError::SampleError)", e.message
+      assert_equal 'user message', e.description
+      assert_equal 'user message', e.desc
+      assert_equal 'user message', e._translate
+      assert_equal 'user message', e.user_message
+      assert_equal 'Test this title', e.title
+      e = SampleError.new(m: 'developer message', desc: :translate)
+      assert_equal "Test sample error (developer message)", e.to_s
+      assert_equal "Test sample error (developer message)", e.message
+      assert_equal "Test sample error", e.description
+      assert_equal "Test sample error", e.desc
+      assert_equal 'Test sample error', e._translate
       assert_equal 'Test sample error', e.user_message
       assert_equal 'Test this title', e.title
       e = SampleError.new(m: 'developer message', desc: 'user message')
-      assert_equal "user message\ndeveloper message", e.to_s
-      assert_equal "user message\ndeveloper message", e.message
+      assert_equal "user message (developer message)", e.to_s
+      assert_equal "user message (developer message)", e.message
       assert_equal 'user message', e.description
       assert_equal 'user message', e.desc
       assert_equal 'user message', e._translate
       assert_equal 'user message', e.user_message
       assert_equal 'Test this title', e.title
       e = SampleError.new(tkey: 'sample.interpolation', value: 'blah')
-      assert_equal "Sample Interpolation blah\nCoaster::TestStandardError::SampleError", e.to_s
-      assert_equal "Sample Interpolation blah\nCoaster::TestStandardError::SampleError", e.message
+      assert_equal "Sample Interpolation blah (Coaster::TestStandardError::SampleError)", e.to_s
+      assert_equal "Sample Interpolation blah (Coaster::TestStandardError::SampleError)", e.message
       assert_nil e.description
       assert_nil e.desc
       assert_equal 'Sample Interpolation blah', e._translate
@@ -104,7 +128,7 @@ module Coaster
     def test_message
       raise SampleError, {m: 'beer is proof'}
     rescue => e
-      assert_equal "Test sample error\nbeer is proof", e.message
+      assert_equal "Test sample error (beer is proof)", e.message
     end
 
     def test_attributes
@@ -124,21 +148,22 @@ module Coaster
       assert_equal 'Coaster::TestStandardError::ExampleError', e.to_hash['type']
       assert_equal 20, e.to_hash['status']
       assert_equal 500, e.to_hash['http_status']
-      assert_equal "Test example error\nTest sample error\n#{SampleError.name}", e.to_hash['message']
+      assert_equal "Test example error (Coaster::TestStandardError::ExampleError) {Test sample error (Coaster::TestStandardError::SampleError)}", e.to_hash['message']
       assert_equal 'rams', e.to_hash['cause']['frog']
       assert_equal 'Coaster::TestStandardError::SampleError', e.to_hash['cause']['type']
       assert_equal 10, e.to_hash['cause']['status']
       assert_equal 500, e.to_hash['cause']['http_status']
-      assert_equal "Test sample error\nCoaster::TestStandardError::SampleError", e.to_hash['cause']['message']
+      assert_equal "Test sample error (Coaster::TestStandardError::SampleError)", e.to_hash['cause']['message']
     end
 
     def test_cause_attributes
       begin
         raise SampleError, {frog: 'rams'}
       rescue => e
-        raise ExampleError, {wat: 'cha'}
+        raise ExampleError, {m: 'abc', wat: 'cha'}
       end
     rescue => e
+      assert_equal 'Test example error (abc) {Test sample error (Coaster::TestStandardError::SampleError)}', e.message
       assert_equal 'rams', e.cause.attr['frog']
       assert_equal 'rams', e.attr['frog']
       assert_equal 'cha', e.attr['wat']
@@ -153,9 +178,7 @@ module Coaster
     rescue => e
       detail = <<-LOG
 [Coaster::TestStandardError::ExampleError] status:20
-	MESSAGE: Test example error
-		Test sample error
-		Coaster::TestStandardError::SampleError
+	MESSAGE: Test example error (Coaster::TestStandardError::ExampleError) {Test sample error (Coaster::TestStandardError::SampleError)}
 	@fingerprint: []
 	@tags: {}
 	@level: \"error\"
@@ -163,8 +186,7 @@ module Coaster
 	@tkey: nil
 	@raven: {}
 	CAUSE: [Coaster::TestStandardError::SampleError] status:10
-		MESSAGE: Test sample error
-			Coaster::TestStandardError::SampleError
+		MESSAGE: Test sample error (Coaster::TestStandardError::SampleError)
 		@fingerprint: []
 		@tags: {}
 		@level: \"error\"
@@ -213,7 +235,7 @@ LOG
       begin
         root_cause_sample3
       rescue => e
-        assert_equal "standard error translation\na", e.root_cause.message
+        assert_equal "a", e.root_cause.message
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.5
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n