coaster 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30a1cd3050a41f9d174b8f163bc73c86519e46535c875664e044d09b5bf5f1a6
-  data.tar.gz: 309a1fd5431ced086709b694f9f7a95f330f5342dc09841729f491ab6f8276ca
+  metadata.gz: c38985e1f47460405cf2cf2e4f9507d78dd0db1f45d939ad5768269f1e2a6e7a
+  data.tar.gz: 5fcefde9af96868f10520648de4d775f58282d42d33e07e8abbbd76806328a93
 SHA512:
-  metadata.gz: 9d93263418966554adf4ec4f509a2cd77f8ab3f478d1aeaa9188e1b36856e1ba5dad2ae8e988bbfb28a5324b790da7dc23e429e6f1e0df1f369d0008414dc45d
-  data.tar.gz: be7411b223a6db84e0e53d738010ad4a620f73b9e2424cb0bfa3c5b9ab5a47bf0d16797c419aa5fd393bc291a67a6946db29f7b783cd79a0230ff3a88a4fdd37
+  metadata.gz: d682e58f09d22aff8992360821e7dffc4a02c057882fb9ba9b9603631d76600c591016c1543b2e561190b9c91354049bfeb907c663abe3523b22d1cfc53b0579
+  data.tar.gz: f5e73571a6ede546e38c34c2145c96b3832888cc642bdc60c15e61ac5f91241359e66a5387b501c2f60b0c6153fdc1fb9facff4caf1ff98dfde35e4b2c1ea769

data/lib/coaster.rb

@@ -5,7 +5,7 @@ require 'active_support/core_ext/string'
 require 'active_support/core_ext/hash/slice'
 
 module Coaster
-  mattr_accessor :logger
+  mattr_writer   :logger
   mattr_writer   :default_fingerprint
 
   DEFAULT_FINGERPRINT = [:default, :class].freeze
@@ -18,6 +18,16 @@ module Coaster
     def default_fingerprint
       @@default_fingerprint ||= DEFAULT_FINGERPRINT
     end
+
+    def logger
+      return @@logger if defined?(@@logger)
+      return Rails.logger if defined?(Rails)
+      nil
+    end
+  end
+
+  def logger
+    self.class.logger
   end
 end
 

data/lib/coaster/core_ext/object_translation.rb

@@ -4,7 +4,7 @@ class Object
   class << self
     def _translate(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
-      options.merge!(_translate_params)
+      options = _translate_params.merge(options)
       options = options.to_hash.symbolize_keys!
 
       key = args.shift
@@ -45,7 +45,10 @@ class Object
 
         if key_class.superclass == Object || key_class == Object
           return options[:description] if options[:description].present?
-          Coaster.logger && Coaster.logger.warn(result)
+          if Coaster.logger 
+            Coaster.logger.info(options[:original_missing])
+            Coaster.logger.debug(caller.join("\n"))
+          end
           throw :exception, result if options[:original_throw]
           missing = options[:original_missing] || result
           msg = missing.message
@@ -61,6 +64,7 @@ class Object
         result = result.dup if result.frozen?
         result.instance_variable_set(:@translated, true)
         result.instance_variable_set(:@tkey, options[:tkey])
+        result.instance_variable_set(:@missing, options[:original_missing])
         result
       end
     end
@@ -78,16 +82,7 @@ class Object
   def _translate(*args)
     options = (args.last.is_a?(Hash) ? args.pop : {}).with_indifferent_access
     key = args.shift || (respond_to?(:tkey) ? tkey : nil)
-
-    if respond_to?(:description) && description.present? && description != 'false' && description != self.class.name
-      if !key.is_a?(String) && key != :force
-        desc = description
-        return desc unless desc.instance_variable_get(:@raw)
-      end
-      options.merge!(description: description)
-    end
-
-    options.merge!(_translate_params)
+    options = _translate_params.merge(options)
     self.class._translate(key, *args, options)
   end
 

data/lib/coaster/core_ext/standard_error.rb

@@ -9,11 +9,7 @@ class StandardError
     def http_status;  500 end
     def report?;      true end
     def intentional?; false end
-
-    def title
-      t = _translate('.title')
-      t.instance_variable_defined?(:@missing) ? nil : t
-    end
+    def title; _translate('.title') end
 
     def before_logging(name, &block)
       @before_logging_blocks ||= {}
@@ -117,18 +113,25 @@ class StandardError
   def object;       attributes[:object] || attributes[:obj] end
   alias_method :obj, :object
 
-  # description is user friendly messages, do not use error's message
+  # 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
-    dsc = attributes[:description] || attributes[:desc]
-    return dsc if dsc
-    msg = safe_message.dup
-    msg.instance_variable_set(:@raw, true)
-    msg
+    attributes[:description] || attributes[:desc]
   end
   alias_method :desc, :description
 
-  # more user friendly messages
+  def _translate(*args)
+    return description if description.present?
+    super
+  end
+
+  # user friendly message, for overid
+  def user_message
+    return description if description.present?
+    _translate
+  end
+
+  # another user friendly messages
   def descriptions
     return attributes[:descriptions] if attributes[:descriptions]
     attributes[:descriptions] = {}
@@ -204,12 +207,15 @@ class StandardError
   def logging(options = {})
     before_logging_blocks.values.each { |blk| instance_exec &blk }
 
-    logger = nil
-    if defined?(Rails)
-      return if Rails.env.test? && (intentional? || !report?)
-      logger = Rails.logger 
+    if !report? || intentional?
+      if defined?(Rails)
+        return if Rails.env.test?
+      else
+        return
+      end
     end
-    logger = options[:logger] || Coaster.logger || logger
+
+    logger = options[:logger] || Coaster.logger
     return unless logger
 
     cl = options[:cleaner] || cleaner

data/lib/coaster/version.rb

@@ -1,3 +1,3 @@
 module Coaster
-  VERSION = '1.0.8'
+  VERSION = '1.1.0'
 end

data/test/locales/en.yml

@@ -1,5 +1,8 @@
 en:
   class:
+    StandardError: 
+      self: 'standard error translation'
+      title: 'standard error title'
     Coaster:
       self: 'Coaster Translated'
       SampleObject:

data/test/test_helper.rb

@@ -6,8 +6,12 @@ require 'pry'
 require 'rubygems'
 require 'bundler/setup'
 require 'coaster'
+require 'logger'
 
 class Raven
   def self.capture_exception(*args)
   end
 end
+
+Coaster.logger = Logger.new(STDOUT)
+Coaster.logger.level = Logger::WARN

data/test/test_object_translation.rb

@@ -37,6 +37,7 @@ module Coaster
     def test_translation_sub
       assert_equal 'Coaster SampleObject Title (class.Coaster.SampleObject.title)', SampleObject._translate('.title')
       assert_equal 'Coaster SampleObject Title (class.Coaster.SampleObject.title)', SampleObject._translate(:title)
+      assert_nil SampleObject._translate(:title).instance_variable_get(:@missing)
     end
 
     def test_translation_with_key
@@ -46,6 +47,7 @@ module Coaster
     def test_translation_inheritance
       assert_equal 'Coaster SampleObject Translated', Inherited._translate
       assert_equal 'Coaster SampleObject Title (class.Coaster.Inherited.title)', Inherited._translate(:title)
+      assert Inherited._translate.instance_variable_get(:@missing)
     end
 
     def test_interpolation

data/test/test_standard_error.rb

@@ -20,6 +20,57 @@ module Coaster
       I18n.enforce_available_locales = false
     end
 
+    def test_standard_messages
+      e = StandardError.new('asdf')
+      assert_equal 'asdf', 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 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
+      assert_equal 'standard error title', e.title
+    end
+
+    def test_no_translation_class
+      e = UntitledError.new('asdf')
+      assert_equal 'asdf', 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 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 'standard error title', e.title
+    end
+
+    def test_with_translation_class
+      e = SampleError.new('asdf')
+      assert_equal 'asdf', 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 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 'Test this title', e.title
+    end
+
     def test_message
       raise SampleError, {m: 'beer is proof'}
     rescue => e
@@ -39,16 +90,16 @@ module Coaster
         raise ExampleError, {wat: 'cha'}
       end
     rescue => e
-      assert_equal e.to_hash['wat'], 'cha'
-      assert_equal e.to_hash['type'], 'Coaster::TestStandardError::ExampleError'
-      assert_equal e.to_hash['status'], 20
-      assert_equal e.to_hash['http_status'], 500
-      assert_equal e.to_hash['message'], 'Test sample error'
-      assert_equal e.to_hash['cause']['frog'], 'rams'
-      assert_equal e.to_hash['cause']['type'], 'Coaster::TestStandardError::SampleError'
-      assert_equal e.to_hash['cause']['status'], 10
-      assert_equal e.to_hash['cause']['http_status'], 500
-      assert_equal e.to_hash['cause']['message'], 'Test sample error'
+      assert_equal 'cha', e.to_hash['wat']
+      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 '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']
     end
 
     def test_cause_attributes
@@ -58,9 +109,9 @@ module Coaster
         raise ExampleError, {wat: 'cha'}
       end
     rescue => e
-      assert_equal e.cause.attr['frog'], 'rams'
-      assert_equal e.attr['frog'], 'rams'
-      assert_equal e.attr['wat'], 'cha'
+      assert_equal 'rams', e.cause.attr['frog']
+      assert_equal 'rams', e.attr['frog']
+      assert_equal 'cha', e.attr['wat']
     end
 
     def test_to_detail
@@ -94,19 +145,19 @@ LOG
     def test_translation
       raise SampleError, {tkey: '.test'}
     rescue => e
-      assert_equal e._translate, 'Test this translation'
+      assert_equal 'Test this translation', e._translate
     end
 
     def test_title
       raise SampleError, 'foobar'
     rescue => e
-      assert_equal e.title, 'Test this title'
+      assert_equal 'Test this title', e.title
     end
 
     def test_title_missing
       raise UntitledError, 'untitled'
     rescue => e
-      assert_nil e.title
+      assert_equal 'standard error title', e.title
     end
 
     def root_cause_sample1
@@ -129,31 +180,31 @@ LOG
       begin
         root_cause_sample3
       rescue => e
-        assert_equal e.root_cause.message, 'a'
+        assert_equal 'a', e.root_cause.message
       end
     end
 
     def test_raven_notes
       raise SampleError, m: 'foofoo', something: 'other'
     rescue => e
-      assert_equal e.notes(the_other: 'something')[:extra][:something], 'other'
-      assert_equal e.notes(the_other: 'something')[:extra][:the_other], 'something'
+      assert_equal 'other', e.notes(the_other: 'something')[:extra][:something]
+      assert_equal 'something', e.notes(the_other: 'something')[:extra][:the_other]
     end
 
     def test_to_hash
       aa # raise NameError
     rescue => e
-      assert_equal e.to_hash['type'], 'NameError'
-      assert_equal e.to_hash['status'], 999999
-      assert_equal e.to_hash['http_status'], 500
-      assert e.to_hash['message'] =~ /undefined local variable or method `aa'/
+      assert_equal 'NameError', e.to_hash['type']
+      assert_equal 999999, e.to_hash['status']
+      assert_equal 500, e.to_hash['http_status']
+      assert_match /undefined local variable or method `aa'/, e.to_hash['message']
     end
 
     def test_descriptions
       raise SampleError
     rescue => e
       e.descriptions.merge!(a: 1)
-      assert_equal e.descriptions['a'], 1
+      assert_equal 1, e.descriptions['a']
     end
 
     class SampleErrorSub < SampleError; end
@@ -168,8 +219,8 @@ LOG
       e = SampleErrorSubSub.new(m: 'foo')
       assert !e.after_logging_blocks[:blah].nil?
       e.logging
-      assert_equal e.attributes[:abc], 100
-      assert_equal e.instance_variable_get(:@blah), 101
+      assert_equal 100, e.attributes[:abc]
+      assert_equal 101, e.instance_variable_get(:@blah)
     end
     class SampleErrorMightHappen < SampleErrorSub
       def it_might_happen?; true end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coaster
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - buzz jung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n