coaster 1.3.2 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25d78eb2f5780582358622b301ce8bc56b65a317bebf07bfdd5d719b18701cca
-  data.tar.gz: 9862b67c209853c1a049e5769e503167e0a76fe687ab479755e3272b052dca5d
+  metadata.gz: b02f79c7d532c329c31d1a0447b62cc35fe42f53292504a3c23f1972716da2c3
+  data.tar.gz: 65adb3dcaff69b3dc0dce3a9ebd46da13477aef544ef22bfedd08cc2fa925f56
 SHA512:
-  metadata.gz: c39ebfe2f732a1f44d0c9d4bdcd0b5a81c1a7fc6b3f76f150be78c83c4fccd6a90b6b4333efd91e0b57194462dd31c58c97bf8225ada59c01efcb3c43b4f313a
-  data.tar.gz: f9915989ceac91f5891ede0dd40ce66c7e4e26f2d6628e508123ee75cb7229e125fe0567576b26f8ecf5e1ab87445ede8699d88d313c431c3968dc2ac8a60090
+  metadata.gz: c3943edf41f83c52e861b672e6c47ff6b3f5bd974195d4e8a492e11586c86b4c643dc52e24edbc5e15bc081453a243a1bd4148c4f029837c4d90417d4303a176
+  data.tar.gz: 555ef999a7d0fa9f3b0ecdcc416d70724af1801a049b86d5877d126236c70b097fea9701a36226e7c1cfea416cf8008bde81e5551a149ed7d0449d303e47ecc3

data/lib/coaster/core_ext.rb

@@ -1,3 +1,4 @@
+require_relative 'core_ext/require_more'
 require_relative 'core_ext/array'
 require_relative 'core_ext/date'
 require_relative 'core_ext/month'

data/lib/coaster/core_ext/require_more.rb

@@ -0,0 +1,22 @@
+def require_more
+  required_file_path = caller[0].split(':', 2).first
+  load_name = nil
+  load_path_index = $LOAD_PATH.each_with_index do |load_path, ix|
+    scanned = required_file_path.scan(/(#{load_path})#{File::SEPARATOR}(.*)/).first
+    next false unless scanned
+    load_name = scanned[1]
+    break ix
+  end
+
+  return false unless load_path_index
+
+  more_load_paths = $LOAD_PATH.drop(load_path_index + 1)
+  more_load_paths.each do |load_path|
+    path = File.join(load_path, load_name)
+    if File.exists?(path)
+      return require_dependency path
+    end
+  end
+
+  raise LoadError, "cannot require more -- #{load_name}"
+end

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,10 +136,8 @@ class StandardError
 
   # user friendly message, for overid
   def user_message
-    return description if description.present?
-    if tkey.present?
-      return _translate 
-    end
+    return _translate if description.present? || tkey.present?
+    return "#{_translate} (#{message})" unless defined?(@coaster)
     message
   end
 
@@ -145,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} (#{to_origin_s})"
-  end
-
   def to_hash
     hash = attributes.merge(
       type: self.class.name, status: status,
@@ -177,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.2'
+  VERSION = '1.3.6'
 end

data/test/test_standard_error.rb

@@ -22,8 +22,8 @@ module Coaster
 
     def test_standard_messages
       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_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
@@ -41,8 +41,8 @@ module Coaster
 
     def test_no_translation_class
       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_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
@@ -68,8 +68,8 @@ module Coaster
 
     def test_with_translation_class
       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_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
@@ -84,13 +84,36 @@ module Coaster
       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_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(desc: :translate)
+      assert_equal "Test sample error (Coaster::TestStandardError::SampleError)", e.to_s
+      assert_equal "Test sample error (Coaster::TestStandardError::SampleError)", 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
       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
@@ -132,7 +155,7 @@ 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 (Test sample error (#{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']
@@ -144,9 +167,10 @@ module Coaster
       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']
@@ -161,7 +185,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\"
@@ -218,7 +242,7 @@ LOG
       begin
         root_cause_sample3
       rescue => e
-        assert_equal "standard error translation (a)", 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.2
+  version: 1.3.6
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2021-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -152,6 +152,7 @@ files:
 - lib/coaster/core_ext/date.rb
 - lib/coaster/core_ext/month.rb
 - lib/coaster/core_ext/object_translation.rb
+- lib/coaster/core_ext/require_more.rb
 - lib/coaster/core_ext/standard_error.rb
 - lib/coaster/core_ext/standard_error/raven.rb
 - lib/coaster/serialized_properties.rb
@@ -179,12 +180,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A little convenient feature for standard library
 test_files:
-- test/test_object_translation.rb
+- test/locales/en.yml
 - test/test_helper.rb
+- test/test_object_translation.rb
 - test/test_standard_error.rb
-- test/locales/en.yml