coaster 1.2.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c85271d1d65e61c492464d2e3bc610bad2fa784ba3da758e246c599ba655262c
-  data.tar.gz: b2715ff440d638cdd164338a1c55b4c689cdad95e54a65b66c29d8ad5e7d7d75
+  metadata.gz: 33d174be37c41745be18836a83e051931f9c7eff099bc65d4bfbdb292e467732
+  data.tar.gz: 8c822b6bad5a1d334057a5cd577e8f236b201cfc74cd8ce6bd1c6586190880ab
 SHA512:
-  metadata.gz: f74c50dce4b7d64a44ec89a67814d2ce2ee1b9c8b89b75aae0fe4dbe05182ac444ac7903f1a5585d227cdb890f566727506722c9878ed12bcd1a583aea42080f
-  data.tar.gz: 19fd1dad72c06d49b5f3a380519a5f1ec7677c201d0485e6eceea866739513989decadafd396733dcffb66392b9ef8dd609feb2a510d307c9ab6e60e36a6faa8
+  metadata.gz: 58cfb38ecda73be57102b58e19d1badabc1a6ddf87717df4d8e6dc74b918fdf7f4e7d3569cffdb32968c3a5adc79b33930b14e534e6d1176656b22048a7a2951
+  data.tar.gz: 2886f1c69b87eda652641e8f28e48fb1514c8e8d1fe0d65973a93d63553426ea8dedd6012f27058b483f3ec293233e1468a1c67763a02ac1e0208804b9b1ff80

data/lib/coaster/core_ext/standard_error.rb

@@ -58,23 +58,23 @@ class StandardError
       msg = hash.delete(:msg) || msg
       msg = hash.delete(:message) || msg
       hash[:description] ||= hash.delete(:desc) if hash[:desc].present?
+      hash[:dev_message] ||= hash.delete(:dm) if hash[:dm].present?
       @fingerprint = hash.delete(:fingerprint) || hash.delete(:fingerprints)
       @tags = hash.delete(:tags) || hash.delete(:tag)
       @level = hash.delete(:level) || hash.delete(:severity) || @level
       @tkey = hash.delete(:tkey)
-      msg = cause.message if msg.nil? && cause
       @attributes.merge!(hash)
     when String then
       msg = message
     when FalseClass, NilClass then
-      msg = ''
+      msg = nil
     else
       msg = message
     end
 
     @fingerprint = [] unless @fingerprint.is_a?(Array)
     @tags = {} unless @tags.is_a?(Hash)
-    msg ||= self.class._translate
+    msg = cause.message if msg.blank? && cause
     super(msg)
   end
 
@@ -116,20 +116,25 @@ 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 dev_message; attributes[:dev_message] end
+  alias_method :dm, :dev_message
 
   def _translate(*args)
     return description if description.present?
     super
   end
 
+  def _translate_params
+    attributes
+  end
+
   # user friendly message, for overid
   def user_message
     return description if description.present?
-    _translate
+    return _translate  if tkey.present?
+    "#{_translate} (#{to_origin_s})"
   end
 
   # another user friendly messages
@@ -139,6 +144,15 @@ 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} (#{dev_message || to_origin_s})"
+  end
+
   def to_hash
     hash = attributes.merge(
       type: self.class.name, status: status,

data/lib/coaster/core_ext/standard_error/raven.rb

@@ -66,17 +66,4 @@ class StandardError
     capture(options)
     just_logging(options)
   end
-
-  # https://github.com/getsentry/sentry-ruby/blob/fbbc7a51ed10684d0e8b7bd9d2a1b65a7351c9ef/lib/raven/event.rb#L162
-  # sentry use `to_s` as a message
-  alias to_origin_s to_s
-  def message
-    to_origin_s
-  end
-
-  def to_s
-    str = super # https://ruby-doc.org/core-2.5.1/Exception.html#method-i-to_s
-    str = "#{user_message} / #{str}" if user_message.present?
-    str
-  end
 end

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.2.1'
+  VERSION = '1.3.3'
 end

data/test/locales/en.yml

@@ -18,3 +18,4 @@ en:
           title: 'Test this title'
   sample:
     title: 'Sample Title'
+    interpolation: 'Sample Interpolation %{value}'

data/test/test_standard_error.rb

@@ -21,66 +21,106 @@ module Coaster
     end
 
     def test_standard_messages
-      e = StandardError.new('asdf')
-      assert_equal 'asdf', e.message
+      e = StandardError.new('developer message')
+      assert_equal "standard error translation (developer message)", e.to_s
+      assert_equal "standard error translation (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 / asdf', e.to_s
+      assert_equal 'standard error translation (developer message)', e.user_message
       assert_equal 'standard error title', e.title
-      e = StandardError.new(m: 'foo', desc: 'bar')
-      assert_equal 'foo', e.message
-      assert_equal 'bar', e.description
-      assert_equal 'bar', e.desc
-      assert_equal 'bar', e._translate
-      assert_equal 'bar', e.user_message
+      e = StandardError.new(m: 'developer message', desc: 'user 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
-      assert_equal 'bar / foo', e.to_s
     end
 
     def test_no_translation_class
-      e = UntitledError.new('asdf')
-      assert_equal 'asdf', e.message
+      e = UntitledError.new('developer message')
+      assert_equal "standard error translation (developer message)", e.to_s
+      assert_equal "standard error translation (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 / asdf', e.to_s
+      assert_equal 'standard error translation (developer message)', e.user_message
       assert_equal 'standard error title', e.title
-      e = UntitledError.new(m: 'foo', desc: 'bar')
-      assert_equal 'foo', e.message
-      assert_equal 'bar', e.description
-      assert_equal 'bar', e.desc
-      assert_equal 'bar', e._translate
-      assert_equal 'bar', e.user_message
-      assert_equal 'bar / foo', e.to_s
+      e = UntitledError.new(m: 'developer message', desc: 'user 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('asdf')
-      assert_equal 'asdf', e.message
+      e = SampleError.new
+      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 (Coaster::TestStandardError::SampleError)', e.user_message
+      assert_equal 'Test this title',  e.title
+      e = SampleError.new(beet: 'apple')
+      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 (Coaster::TestStandardError::SampleError)', e.user_message
+      assert_equal 'Test this title',  e.title
+      e = SampleError.new('developer message')
+      assert_equal "Test sample error (developer message)", e.to_s
+      assert_equal "Test sample error (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(dm: 'developer message')
+      assert_equal "Test sample error (developer message)", e.to_s
+      assert_equal "Test sample error (developer message)", 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 / asdf', e.to_s
+      assert_equal 'Test sample error (Coaster::TestStandardError::SampleError)', e.user_message
+      assert_equal 'Test this title', e.title
+      e = SampleError.new(m: 'developer message', desc: 'user 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(m: 'foo', desc: 'bar')
-      assert_equal 'foo', e.message
-      assert_equal 'bar', e.description
-      assert_equal 'bar', e.desc
-      assert_equal 'bar', e._translate
-      assert_equal 'bar', e.user_message
-      assert_equal 'bar / foo', e.to_s
+      e = SampleError.new(tkey: 'sample.interpolation', value: 'blah')
+      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
+      assert_equal 'Sample Interpolation blah', e.user_message
       assert_equal 'Test this title', e.title
     end
 
     def test_message
       raise SampleError, {m: 'beer is proof'}
     rescue => e
-      assert_equal 'beer is proof', e.message
+      assert_equal "Test sample error (beer is proof)", e.message
     end
 
     def test_attributes
@@ -100,12 +140,12 @@ 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 sample error', e.to_hash['message']
+      assert_equal "Test example error (Test sample error (#{SampleError.name}))", 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', e.to_hash['cause']['message']
+      assert_equal "Test sample error (Coaster::TestStandardError::SampleError)", e.to_hash['cause']['message']
     end
 
     def test_cause_attributes
@@ -129,7 +169,7 @@ module Coaster
     rescue => e
       detail = <<-LOG
 [Coaster::TestStandardError::ExampleError] status:20
-	MESSAGE: Test sample error
+	MESSAGE: Test example error (Test sample error (Coaster::TestStandardError::SampleError))
 	@fingerprint: []
 	@tags: {}
 	@level: \"error\"
@@ -137,7 +177,7 @@ module Coaster
 	@tkey: nil
 	@raven: {}
 	CAUSE: [Coaster::TestStandardError::SampleError] status:10
-		MESSAGE: Test sample error
+		MESSAGE: Test sample error (Coaster::TestStandardError::SampleError)
 		@fingerprint: []
 		@tags: {}
 		@level: \"error\"
@@ -186,7 +226,7 @@ LOG
       begin
         root_cause_sample3
       rescue => e
-        assert_equal 'a', e.root_cause.message
+        assert_equal "standard error translation (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.2.1
+  version: 1.3.3
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -80,48 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement